It's amazing what reversing the order in an if statement will do. Doing so

2000-11-22    <jrb@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_calc_size): It's amazing what
	reversing the order in an if statement will do.  Doing so managed
	to make the treemodelsort half work.  Other half will follow after
	I get the insert function fully fixed.

diff --git a/ChangeLog b/ChangeLog
index bb61dcb77059b589de79bb903cd9f55fa8fc8433..88a93877ffe432d91ae280be91240bb599af0498 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-11-22    <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_calc_size): It's amazing what
+       reversing the order in an if statement will do.  Doing so managed
+       to make the treemodelsort half work.  Other half will follow after
+       I get the insert function fully fixed.
+
 2000-11-21  Elliot Lee  <sopwith@redhat.com>
        * gtk/gtkmenushell.h: GdkEventButton->button can occupy significantly
        more than 2 bits. Besides, I need to implement an evil hack. :)

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index bb61dcb77059b589de79bb903cd9f55fa8fc8433..88a93877ffe432d91ae280be91240bb599af0498 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+2000-11-22    <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_calc_size): It's amazing what
+       reversing the order in an if statement will do.  Doing so managed
+       to make the treemodelsort half work.  Other half will follow after
+       I get the insert function fully fixed.
+
 2000-11-21  Elliot Lee  <sopwith@redhat.com>
        * gtk/gtkmenushell.h: GdkEventButton->button can occupy significantly
        more than 2 bits. Besides, I need to implement an evil hack. :)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bb61dcb77059b589de79bb903cd9f55fa8fc8433..88a93877ffe432d91ae280be91240bb599af0498 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2000-11-22    <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_calc_size): It's amazing what
+       reversing the order in an if statement will do.  Doing so managed
+       to make the treemodelsort half work.  Other half will follow after
+       I get the insert function fully fixed.
+
 2000-11-21  Elliot Lee  <sopwith@redhat.com>
        * gtk/gtkmenushell.h: GdkEventButton->button can occupy significantly
        more than 2 bits. Besides, I need to implement an evil hack. :)

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index bb61dcb77059b589de79bb903cd9f55fa8fc8433..88a93877ffe432d91ae280be91240bb599af0498 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+2000-11-22    <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_calc_size): It's amazing what
+       reversing the order in an if statement will do.  Doing so managed
+       to make the treemodelsort half work.  Other half will follow after
+       I get the insert function fully fixed.
+
 2000-11-21  Elliot Lee  <sopwith@redhat.com>
        * gtk/gtkmenushell.h: GdkEventButton->button can occupy significantly
        more than 2 bits. Besides, I need to implement an evil hack. :)

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index bb61dcb77059b589de79bb903cd9f55fa8fc8433..88a93877ffe432d91ae280be91240bb599af0498 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+2000-11-22    <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_calc_size): It's amazing what
+       reversing the order in an if statement will do.  Doing so managed
+       to make the treemodelsort half work.  Other half will follow after
+       I get the insert function fully fixed.
+
 2000-11-21  Elliot Lee  <sopwith@redhat.com>
        * gtk/gtkmenushell.h: GdkEventButton->button can occupy significantly
        more than 2 bits. Besides, I need to implement an evil hack. :)

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index bb61dcb77059b589de79bb903cd9f55fa8fc8433..88a93877ffe432d91ae280be91240bb599af0498 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2000-11-22    <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_calc_size): It's amazing what
+       reversing the order in an if statement will do.  Doing so managed
+       to make the treemodelsort half work.  Other half will follow after
+       I get the insert function fully fixed.
+
 2000-11-21  Elliot Lee  <sopwith@redhat.com>
        * gtk/gtkmenushell.h: GdkEventButton->button can occupy significantly
        more than 2 bits. Besides, I need to implement an evil hack. :)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index bb61dcb77059b589de79bb903cd9f55fa8fc8433..88a93877ffe432d91ae280be91240bb599af0498 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2000-11-22    <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_calc_size): It's amazing what
+       reversing the order in an if statement will do.  Doing so managed
+       to make the treemodelsort half work.  Other half will follow after
+       I get the insert function fully fixed.
+
 2000-11-21  Elliot Lee  <sopwith@redhat.com>
        * gtk/gtkmenushell.h: GdkEventButton->button can occupy significantly
        more than 2 bits. Besides, I need to implement an evil hack. :)

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index e1122db48cfbc3dd63d6ca4f835b3ca94dddd965..f8ed23d7709d9a5501a40a5bda3b9c62930798ee 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -2318,8 +2318,8 @@ gtk_tree_view_calc_size (GtkTreeView *tree_view,
            column->size = MAX (column->size, width);
        }
       _gtk_rbtree_node_set_height (tree, temp, max_height);
-      if (gtk_tree_model_iter_children (tree_view->priv->model, &child, iter) &&
-         temp->children != NULL)
+      if (temp->children != NULL &&
+         gtk_tree_model_iter_children (tree_view->priv->model, &child, iter))
        gtk_tree_view_calc_size (tree_view, temp->children, &child, depth + 1);
       temp = _gtk_rbtree_next (tree, temp);
     }